From: Jonas Ådahl <jadahl@gmail.com>
Date: Tue, 12 Nov 2019 18:43:38 +0000 (+0100)
Subject: Stop referring to ClutterTexture
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~413
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=88bcaafe86b439db97eadc76b3b50395e5175724;p=gnome-shell.git

Stop referring to ClutterTexture

ClutterTexture is removed from mutter's clutter fork, so lets stop
referring to it. This also happens to fix an incorrect type cast.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/822
---

diff --git a/src/shell-app.c b/src/shell-app.c
index 33d5ec3a7..14ebfc40d 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -223,7 +223,7 @@ window_backed_app_get_icon (ShellApp *app,
 /**
  * shell_app_create_icon_texture:
  *
- * Look up the icon for this application, and create a #ClutterTexture
+ * Look up the icon for this application, and create a #ClutterActor
  * for it at the given size.
  *
  * Return value: (transfer none): A floating #ClutterActor
diff --git a/src/st/st-drawing-area.c b/src/st/st-drawing-area.c
index f561759c6..38085a901 100644
--- a/src/st/st-drawing-area.c
+++ b/src/st/st-drawing-area.c
@@ -22,9 +22,8 @@
  * SECTION:st-drawing-area
  * @short_description: A dynamically-sized Cairo drawing area
  *
- * #StDrawingArea is similar to #ClutterCairoTexture in that
- * it allows drawing via Cairo; the primary difference is that
- * it is dynamically sized.  To use, connect to the #StDrawingArea::repaint
+ * #StDrawingArea allows drawing via Cairo; the primary difference is that
+ * it is dynamically sized. To use, connect to the #StDrawingArea::repaint
  * signal, and inside the signal handler, call
  * st_drawing_area_get_context() to get the Cairo context to draw to.  The
  * #StDrawingArea::repaint signal will be emitted by default when the area is
diff --git a/src/st/st-image-content.c b/src/st/st-image-content.c
index bf4c5bfc5..0b379c4bb 100644
--- a/src/st/st-image-content.c
+++ b/src/st/st-image-content.c
@@ -146,7 +146,7 @@ st_image_content_get_preferred_size (ClutterContent *content,
 {
   StImageContent *self = ST_IMAGE_CONTENT (content);
   StImageContentPrivate *priv = st_image_content_get_instance_private (self);
-  ClutterTexture *texture;
+  CoglTexture *texture;
 
   texture = clutter_image_get_texture (CLUTTER_IMAGE (content));